A little toolbar stuff, comments still broken.