Add comments
And make menu items more better