Desktop - Performance improvements and bug fixes