Added navbar and cleaned up various views