Tweak UI slightly and
fix route.