Adjust control preferences layout as per #599