renaming activity layouts and using LayoutInjection
updating injection framework