Better support for UI controls