+ quotes logic
- improved main menu