dashboard edit
merge
displaying current trip button works