rollback validation and fixed back button