Changing getVisualBounds() to getBounds()
Fixing merge conflicts