FIX: Multiple fixes, toolbar toggling, docstring