09c5643 layout and post polishing