Improve Consistent handlers. Add Empty to UI Configuration. Improve UI.