Back buttons enhancements