AppSaloon improvements