added toggles, removed chart labels and cleaned up table