Fixes

* Minor GUI fix
* Fixes in triggers etc.