Added the previous layout hack to the CXP capability form as well.