Changed the templates a bit, working on showing the results