Improve selection area