Fix issues with mobile template

See extended commit messages...