Updated the display a bit and fixed an class namespace issue
Updating the templating stuff