Fixed more problems with 'Back' buttons