Clean up formatting
Modify layout into 3 sections