refactoring, action bar, analytics