Added enable/disable domain URL checkbox functionality && refactoring Storage code