Layout bugfix