More toolbar buttons and a bit of refactoring