Adjust controller preferences layout after changes related to #625