Fixed the layout a bit