Removed numberpicker colour change
Fixed merge conflict