Fixed alignments on mobile views
Merge branch 'templating'