Merge "Use framework style for section headers and visual tweaks"