Edit time recorded before sending to API
 - Cleanup of use device keyboard code