cleaned up 1/21 templates

usable on editor and also fixed alignment errors