updated layout and hopefully nav