Nearly done with new layout method