Changed the redirect location and the formatting