Move meta into layout
Add upload activities for old uploads