More layout. Starting to look right, but not quite feel right. The markup is a little heavy for my tastes too.