updated layout and nav controller