Finished toggle button, plus other tweaks.