First pass at mobile optimization. Clarify the stack