updated options design
Merge pull request #214 from paczian/master

updated options design