Fix for missing toolbar