Now I'm much happier with the layout/structure