updated layout and nav