added a day/month picker, aggregated several type variables into a single one