Migrated resource files from old to current; proper activity layout inheritance