add support for license_days and vehicle days, also restructured the row layout