Features/optimize redirect page

@ryabrody fyi