Bug/277/navbar dd