Selection rectangle drawing now part of main draw routine