Improve new layout