Made the layout a little better