Work on options
Conflict resolution
Buttons overhaul
0.1.11