Add navbar & views, fix routing