Added bounding boxes for selection
Code cleaning