more layout update, front end script update