Throttling fixed, back to controls-on-row UI approach, minor fixes