Made some changes to formatting and redirect