merge @j-ed's version and fix layout
Merge pull request #190 from owncloud/fix-all

merge @j-ed's version and fix layout