Updated html layout, style