Enhanced layout design