Fix the frontend UI when both in Dark and Light mode
Fix the frontend UI when both in Dark and Light mode