Fix nav container usage
WIP