Add/Update controllers and views - Add layout (fix errors)