major refactoring, started using butterknife