added fields for disks
merged
updated gitignore
small fixes
Added onfirmation box and fixed rollback issue