Use the right frame with determining correct managed display
Use the right frame with determining correct managed display

Closes #223

cevaris/Amethyst,olsonpm/Amethyst,hooplaaa/Amethyst,ianyh/Amethyst,ianyh/Amethyst,cevaris/Amethyst,olsonpm/Amethyst,hooplaaa/Amethyst,m4rw3r/Amethyst,m4rw3r/Amethyst,ianyh/Amethyst,egabancho/Amethyst,ianyh/Amethyst,ianyh/Amethyst,egabancho/Amethyst