Lots of tiny fixes

Also remove togglebutton - kinda useless