ha before mamuri
change whole layout, commit for merging