Change names and layout of add