Finished the bulk of style and layout fixes