Made Notifications Button work + Minor code cleanup and fixes
Merge pull request #44 from exside/master

Made Notifications Button work + Minor code cleanup and fixes