Revert "Merge branch 'master' into CSS-"

This reverts commit 0fffe9a40382e08a7f736f79a858f6404505f268, reversing
changes made to c7333cd8861796cc659d8ad91a5ab3ffad71415e.
Trying to fix merge

- problem with drop panel
- buttons don't work anymore