Ctmm layout

BMIA-6 Implements GUI changes to master branch. #resolve