Improve css for options panel.
Merge remote-tracking branch 'origin/master'