Click functionality extracted to class, removed unused delegate, added regions