[WIP] Replace EditTrip Popup with Activity, organize various imports.