One last fix for the navigation buttons