added Activities for login and list forms
conflicts resolved