Merge pull request #65 from dreamteam69/master

Change options to feel more like the system
Make the selection fancy