markup and style improvements