More updates for activities/layouts.