90% finish with layout