Updated html layout