Rework on toolbar + download material