UX changes, and offline mode performance improvements