Final mobile changes