Additional e2e scenarios. Minor UI tweaks.