[#43416889] Adjust various styles that were thrown off by merges
Merge pull request #30 from loganbfisher/43416889_fix_various_style_problems

[UI][#43416889] Adjust various styles that were thrown off by merges