Fixed a nav switching bug in Gallery
Merge conflict removal