Bugfixing and making sure that the toggle button works as expected and returns to the previous state.