Updated toolbar after BB changed styles and fixed some links