More improvements to mobile view, separate desktop and mobile templates and views