Arranged code and fixed small issues in StoreController
New events