All new UI
Merge pull request #23 from zghaobac/develop

All new UI