Updated layouts for v11
Merge pull request #501 from jaypoulz/jp447

Updated layouts for v11
Merge remote-tracking branch 'upstream/master' into ms485
Manual text input for text fields enabled