Fixed null map bugs
Refactored MainToolStripButtonsFactory