Various fixes + time picker