Refactor guardians views and controller