Finished the desktop layout, the icons and cleaned up the helper classes a bit.