Made lots of changes to UI and got the nav bars working