refactor navbar and world