Fix some layout details