Fixed issue 1347 on ontimenow, and also some additional ui changes