Ton of refactoring mainly in User interface