Refactor SimpleForm to be able to add multiple components to one row

This instead of adding nested panels to workaround this previous limitation
of the SimpleForm

SOAP-1640 Implement the Token status scenario