Fix date field, fix buttons