tidy up imports
fix for time format in time picker (12 hour version)