Change stuff to HTML, no use for PHP
Merge branch 'dev'