Fixed dark mode issues
Minor UI changes
