Adjusted the layout a little