refactor
refactor data
refactor data
ui cleanup
Merge pull request #1 from mfrederickson/refactor

Refactor