layout and bugfixes