Moves ui-toggle-expansion down to arrow and title

This may break a lot of tests