fixing issues with the markup/format