Added button @view
Fixed navigation event