More template changes, added graphs etc...