CMT part 2 fixes and Master Template Menu pages