Support for different Button size & fix for link draging