Change layout according to schubby's suggestions
Merge branch 'master' of https://github.com/guishu/caviciel