Remember last button & some cleanup