Almost complete all UI
Merge pull request #1 from AndyYou/master

Almost complete all UI