re-order columns to add space for charm store
refactor into machineslist and serviceslist to allow re-using in chooser dialog
Add machine and service choosers and beginnings of constraint handling