Layout changes + fixing PHP warnings see #7403