adding back components, working on toolbar items