Better floor plan