Fixed more visual styles and fixed some data labels for proper mappings.