Homepage updates

Rearranged page structure slightly, and updated nav to match