updated homepage and rearranged headers to be more readable
Merge branch 'master' into dev
minor update