additional edits to resolve the issues with the android action bar