more fixes to product responsiveness