Fixed html rendering and routing

Change-Id: I254f4420dc03d9e6cea9019b27e9d866357b0f76
mergefix

Change-Id: Ibf95d11ff5302b6f857c11a630db55b683a51e1b