Point highlighting & improved hints
Improved user interface
Merge remote-tracking branch 'lisyarus/gui-fix'