Clean up white space and fix margins