fixed template issues and fixed mobile version