Bug 1028020 - Fix the layout of FMD and DNT
Merge pull request #21012 from crh0716/1028020

Bug 1028020 - Fix the layout of FMD and DNT r=eragonj