Layout fixes for problems caused by previous layout fixes ;)