Completed Theme 2?

Resolved nav bar issue, completed theme 2 (for now) made some tweaks to
theme 3.