I can get used to F7 targeting so option 2 is slightly preferable but Option 1 is just about as good in my eyes. Please do not leave things as they are now.