Add favourite functionality and improve logon class to deal with generic windows