Fix Nasty bug due to big refactoring, all view annoation OnAction ...
etc were broken