small tweaks to layout and bugfixes