Added back buttons and corrected existing ones