improved layouts and metadata