Layout bugfix 2