moving assets around, fixing some quirks in the templates