Minor display issues and validation fixed.
Reverting previous fix.
Fixed regression on select styles.