started to divide views up, added navbar