[minor] fixes to form layouts