Small refactoring (Configuration UI related). Removed redundant code.
Huge set of changes related to UI Configuration refactoring.