Product design and nav_bar fix