Fix build. Fixed navigation buttons so views are popped instead of pushed (and slide the right way)