Merge pull request #28 from robertn702/style

Updated CSS
set fixed width and height to category & merchant buttons and added margin to labels
changed font and refactored css
fixed wrapper size and scrolling