cleaned up redirect logic, made it all one page