Added selection rectangle
Removed old code