Improved templates. Merged cells and shit.