
        Better naming and file separation for toolbar objects

0e2a935