Fix block Search functionality
Merge style additions