Adding tabletop and basic layout