22 23 timepicker markup

Resolves ticket #22, and #23