Added support for back-navigation