Final class cleanup
Some ui updates
More ui updates
Start on cpp updates
Attempt to fix Mac modal issue (not working)
Fix for triple-modal
Try to fix non-native second dialog