Changed toggle and folding