Added action bar; added Paul's changes