90% layout complete