Tweaks to UI and Storage system