fixed table in arkitektur
solved conflict
Centering table
merge