proper ui integration
Merge pull request #26 from himleyb85/ui

proper ui integration