Fix missing help&back buttons issue in CSP