Issue #286 - Use arrangedContent for survey related controls