layout changes and bugfixes