Swap button implemented, endTrip and updateClock fixed