change layout + bugfixes