More consistent html structure