Add basic support for hours as an option.
Improved hour support, including new design for Duration window.