optimized date and time widgets, removed redundancy