Merging desktop with repository. Not much changes were added.