Layout and structure improvements