Fix for overlapping widgets