Fix the layout
Merge branch 'master' of https://github.com/n3phele/mobile-ui-enyo