Merge pull request #367 from leider/master

fix für #326 #358 #359
Layout fix
Merge remote-tracking branch 'upstream/master'
hopefully fix for #331