Added navbar file and necessary refactor