Updated back functionality to work everywhere