fixedbugs

layout fixedbugs