Buttons replaced with ActionBar
Added action bar; added Paul's changes
Should be resolved?