Fix problems in the layout