Fix some layout mistakes.