Applied getFieldOption() where we could for better code stability
Fixed some minor layout issues with expandable forms