fix some issues with the layout