Fixed grappelli templates to work correctly with our updated UI