pause fix and making templates nice