Fix layouts and widgets