fixing redirect
fixing screen stuff