Made the layout a bit better