Lots of small improvements + Buttons for Patrick (ButtonSet2.png)