last few changes to add back button on forms