Merge "Fix position of expand/collapse button"