Add keyboard input
Clean up the formatting for times a bit