Revert "Revert "mas changes for iPad""

This reverts commit 37c358194fa92fa57431e57560342184a06ac0f1.
bring it back around