#1293 added updates to fix navbar conflicts