design updated, redirection fixed