Adding navbar and layout tweaks.