Fixes #319
Fixes #324
Resolves #323, makes Organize Parts the default toolbar action