Change submodel add button style
Improve logic of getName
Fix os path variations