Adjusted a bunch of layout/styling