Objectify UI code
Merge pull request #6 from jimmed/ui-rewrite

Objectify UI code