still trying to merge this navbar file!