No need to remove the head light assembly or the screen. Just remove the instrument cluster and you have the access you need.
That way you can work on a headlight assembly that is fixed to the bike and does not move loosely around on your table while you work and you have no need to re-adjust the headlight (hight and sideways) after you re-fitted it.