newer UI
fix merge issuses
UI activity combo