Fix the layout a bit