Added Server Id to layouts