Do final UX changes for first version