Added Drawer Navigation and re-factored some activty source