Fix double rendering of block edit toggle
UI enhancements for breaking rows after blocks
Fixes to sorting and paging