Back button and menu button weren't *quite* fixed; now they are!