Tidying up of toolbar buttons and links