[NF] Improvements in layout.