Minor changes to support UI overhaul