Time Selector doesn't handle single hours/minutes correctly

I think we need to branch the github project I am using for the Time Selector. I like it but it does some weird stuff and also had to fix a bug - so need to do a comparison after checking out the project.  
