have added settings item in NavigationDrawer
and fixed some others bugs