Refactor code
Merge pull request #27 from toiee/feature-flatui

Feature Flat UI