Break out some templates for easy override, clean up search on dashboard

Breaks out templates to base and extended templates, so that we can easily
override the blocks.