fix redirect handling! + small ui fixes