some refactoring, activities and layouts renamed