MUMUP-1429 : Change layout ajax call to be one call