Improving mobile version (v2)