Lint: layout, html changes

not all changes have been made. Only this which are not causing
problems.