Nav repeat fix and colour update