Cleaned up templates used for tipp addition/removal/change