Worked on button styles
Merged in remote
Updated gems, fixed merge error