Added block selection and highlighting