fixed: new layout