Slight formatting and UX changes.