first action bar implementation
fixed merge conflicts