fine-tuned styling
merge conflict
Merge pull request #119 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design