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