Code-base update / creating toolbar