Updating minor changes for move to desktop