Changed UI due to refactoring