Changed grid layout for controls