added margins and general formatting changes
Merge branch 'front-end'