Simplifications on the desktop application
Simplifications on the desktop application


Former-commit-id: 817e342108bf30a4d304c47cb6752af25b0916e9
muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous