some a template changes and working around static files - not really happy with it