Adding better classes for form containers

Change-Id: Icd66e119a0c97f35c66839c6574dc05670379d26