Cleaned up index and added better redirection