Has anyone found the right cups to fit in the numerous cup holders? Is there a way to improve on the cupholders between the driver and passenger seats? Thanks.