Fix routing of states, serve correct HTML