Code refactoring. Improved UI.
 Code refactoring
Code refactoring