small bugfixes and layout changes