Popup, saving instance state, minor changes