Fixes to make layout more responsive.