navigation buttons improved