#2 - The options rendering order was fixed.