Changed ui
Refactoring