Moved some things into handlebar templates