navigation fix
added modals