Changed html structure