DS-1975 Remove unnecessary JSPUI "container" attributes

Note:- These changes remove some funny alignments and introduce others, but they will be addressed under separate Jira issues.