Edit more templates; Need to work on serving correct templates for mobile/desktop viewing so templates don't have to be swapped back and forth [MJ-131]