Tweaked the layout. Should be ready for rev B.