fix controller & views