Widgets overflowing bug fix