Removed color from navbar; added layout