Fixed light theme UI bugs