Minor fixes
Refactoring and notifications incoming
Minor refactoring and settings page fixes
Remove temp directory