Bugfixes and layout tweaks