Code refactor.

Added new UI.
Code Cleanup.
Goes with previous commit.
Added new functionalities
Merge branch 'dev'