minor bugfixes and layout changes