Improve back/forward buttons