Fixes for mobile and updates to template