Controllers and views corrections