Updated html structure