Code update tidy up numberpicker and colourpicker