Legend button added, better resizing main plot
Conflicts resolved