Updated style-sheet and handlebar templates
Merge branch 'cleanup'