More work on action bar handler