refactored edit and new trip forms