Refactored. Adjusted UI.