Bug 1028020 - Fix the layout of FMD and DNT