SWITCHYARD-1326, SWITCHYARD-1327, SWITCHYARD-1328 - This commit fixes
models and UI for several issues