Added layout with grid system and routing