layout and semantic improvements