added x span in content window, simplified window and search toggles