fix for timepicker
new features for basic builder