Fixed focus issue.
Fixed focus issue.
Changed redirection
Cleaned up old commented code.