Consolidate Controllers (simplifies logic). Minor template updates