no return button working correctly

Fixes Github Issue 54-Return Trip View