Fixed some layouts for widgets