Added signal selection and fixed scroll bugs