Fix #7197 - fix form layout files and doc labelalign