added changes to login form and activity add and edit form