Continue refactoring of UI controls for pkg.ts usage#859

sinelaw wants to merge 2 commits intomastersinelaw/fresh:masterfrom

layoutsinelaw/fresh:layoutCopy head branch name to clipboard