Updated more placeholders and fixed spacing issues.