Finished more layouts, added the activity classes.