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

Styling and ux design
reverted mobile changes
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into styling_and_ux_design