More buttons and easier adding of buttons