Fix mobile popup.
Resolving conflicts
CT's WIP codebase as on Oct 22, 2013