Added some validation & redirect page