Bugfixing layout