Added further structure for viewing subformula components