Merged in some of Kim's layouts to the existing code.
Merged in some more of the new layouts.
Changed some activity titles.