add a bunch of views & improved navbar