UI changed to more generic format.