Move add button event to nav view; reuse nav view; cleanup.