Feature Flat UI

Refactor code.