Added Navigation bar
Merging