some minor changes from desktop