finish UI spike 1
Merge pull request #60 from marshallshen/ui_spike

finish UI spike 1