update new stable layout; WIP