A lot of progress on getting the theme and content layout right