updated mac settings and scroll past end

Change-Id: Ib58df243648679778d937095c18a62879229d5c8
macmacmac

Change-Id: Iccc0fc43e20d57505d794a1c003985f9c45ab7f4