Added controllers and tested views