Refactored UI. Fixed visual bug.