fixing issues with the markup