Fixed admin issue with source models and added step templates for 1.8 compatibility