Cleaned up grid system and scaffolding