Added label to BootstrapOptionsetField and tidied js some