refactored code & UI changes