Removes hardcoded titling
Removes old template
Changes some class names and adds titling