PEP8 fixes and remove unused variables
Fix name for UFS form
Add UFS volume manager to the tree menu