Added navbar and cleaned up formatting