finally fixed layouts