Change some HTML elements around
Merge branch 'master' of https://github.com/mattludwigs/proto1