Fix Poor styling and structural issues.