Fixed bug with some panel overlap