Fix problem with layout