Fixing UI and storage glitches