Improved CigInfo Layout