Routes and html requests fixed