More work on theme and overall site organization