Add checks to edit action and delete button
Remove old tab/button view