updated buttons and new trip form