User model/controlen/view changes + fixing of other events things

Signed-off-by: mbryl <bryl.marcin@gmail.com>