Improve slim templates