More formatting, more refactoring
Formatted form pages to have margin on left