More ActionBar cleanup and changes