Several UI changes and fixing of color-scheme throughout