Fixed issues with page generation + reorganised page structure a bit