Fixing UI desktop issues