Squared borders and narrowed content area
Merge branch 'master' into ui_redesign
Body margin changes
Merging in first UI redesign changes