Convert everything over to Slim templates; other clean-up