Clean-up/rename. Moving some things around.
1.5.8 fixes collapse/expand functionality. collapse was simply inversing state, which was wrong.