Made Changes to the toolbar and rightclick menu