Fixed Controllers and views