Peter - Moved buttons into the toolbar