fixed page redirections issues