bugfix content markup and better semantic