Add more STI models and change form to select only STI models
Lots of polish