fix some css styles
use modal dialog for poweroptions
Merge remote-tracking branch 'original/master'