finished redoing ui, back in state it was before changes