Removed controller, updated list templates