Desktop version fixes based on client's feedback