fixed close buttons throughout