added back button
fixed some state reset issues