Changed selectors in order to work in more different situations.