Improving mobile wrapper