Update screens
Refactor activities
Refactor activities