Fixing mobile templates too