Fixed bugs on events and also some view adjustments