Refactor Code
Remove posibility of App Crashes
Switched to Navigation Drawer