Storage fix and continued UI improvement