Minor fixes

Back button fix