cleaned up toolbars, filled in links