Markup grid improvements