fix label frame and add button
Merge branch 'master' of github.com:jpstern/Phocal