Refactor views, modify destroy action