few fixes and close toggle