Fix layout and simplify html