minor cleanup of data
add <optgroup> to new floor list