desktop changes from sat night
fixed merging conflicts