backend->frontend fixes
Merge branch 'master' of github.com:ctldev/ctlweb