Merge "add changes to make the add user button up to spec" into pi-dev