Merging my changes with Rusty's

Did some work on navigation, CSS file structure, and other various changes.