change name and some layout