some layout bugfixes