Fixed layout on pages / layout mostly complete now