Open/close buttons should toggle properly now