merge update of sorento changes

Numerous fixes and css tweaks