Added settings activity and updated action bar