Nav-bar feature  & Fixing layout issues