Refactored layout
Merge
Merge branch 'master' of github.com:aakb/smiley