Various fixes

* fixed #202
* fixed #193 
* fixed: selecting/unselecting elements did show private buttons in public area (+ it broke the layout).