Fix routing, fix html references