layout fixes
Merge branch 'master' of github.com:peterssonjesper/devnull2013