Separated label from field in order to add class to the label (fixes wrapping between label and select box)
Bug fixes, layout changes, etc.