Improved desktop file handling
still fighting with menus