Closes #387 Seems to mostly deal with admin and list templates