Polishing UI
Merge pull request #17 from warjohn123/master

Polishing UI