More fixes.

Fix a bunch of stuff that found after working with night theme on prod