UI improvements
Merge branch 'master' of github.com:mmattm/fbuilder