Added and corrected back buttons