UX change. Some updates.