Bit more cleaning

- Simplified both activity_life_goal.xml and activity_log_task.xml