minor fixes - removed back button in places and made it load less places in settings