Rework some layouts
Merge branch 'master' of github.com:outlying/weiter