All caught up now and much happier with the design