Pass EndToEnd tests, some UI tweaks