Add todo's, change template indentation