Major change: made GOP UI code modular