Fixing UI and basic functionality