Views && Model fixes by rcotrina94