Cleaned up homepage generator