Clean up menu
Alter ID
Add linking ability