Layout modifications suggested by PO