make the ds nicer to the cache
fix template bug
make the ui consistent