Class changes to simplfy optional tabs and legend configuration