changed selecting elements to focus to use component query selector