Merging navbar and naming convention changes