layout and bugfixing