Homepage edits, pony wording, dashboard styles, main nav, about page
Merge conflicts