Initial merge of layout fixes from PlmMiddleMan repo
Merge branch 'master' of https://github.com/jetsonsystems/PlmFrontEnd