I'm thinking if it's worth to do a little redesign that could take few days of extra work...