Ui changes and newusersetup prep