Fix up leftnav issues with merge
Fix up leftnav issues with merge

quartzjer/Locker,LockerProject/Locker,othiym23/locker,othiym23/locker,LockerProject/Locker,quartzjer/Locker,LockerProject/Locker,LockerProject/Locker,LockerProject/Locker,quartzjer/Locker,othiym23/locker,Singly/hallway,quartzjer/Locker,othiym23/locker,quartzjer/Locker,othiym23/locker,Singly/hallway