Closes #3413121
Everything has been addressed but double check me. For anything about section or layout I have created a related ticket around refactoring those items and that should fix the issues outlined in the description.