navbar remaining fixes - Gaurav