New MD layout to fix issues