Some tweaks in router. added htmlgenerator file