Add navigation and fix delete button