adding template override functionality and fixing migrations