add contract/expand icons, small fixes