Feature/improve sos panel

Improved SOS panel