refined and fixed layouts