Updated some images and fixed navButton highlighting