bugfixes layout
Merge branch 'master' of github.com:munen/wittbib