Move some css, re add body padding