Add more controllers
Edit some views