split section and focus fixes