Cleans code
Improves templatetags
Fixes instance placeholder