Reworked options dialogs
Merge branch 'master' of github.com:minego/macaw-enyo