Options and TODO UX changes