Copy change and minor UI tweaks and bug fixes