Layout stuff. Fixed DCHM.
Had to do a quick merge.
Layout stuff.