Fixed diff loading issue
Cleanup code
Change menu names for clarity