changed views, updated controllers