Code cleanup
Updating the desktop view