Merge pull request #88 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design, markers on map and trying to fix pinch resizing
Merge pull request #89 from fiery-skippers-2014/styling_and_ux_design

nathan said i could merge it
galaxy s3 fix perhaps