Fix some layout