update layout and change name