Switched to grid placement of widgets, much cleaner looking