Get rid of useless check
Use correct form labels
Better styling of the picksets