Added Add/Delete Folder Pop-Menu Items and modified few item for better readability