[TR, PO] {other} refined layout and fixed bugs with it