navbar and better layout