Fix Issue with main viewport wrapper class overwriting all set classes