Improved re-render times and date selection