layout and customer fix
build