Create basic sematic html form layout
Resolve merge conflict