Another large update for the layout, and nav.  Adding a few of the new controllers as well.