Refactor structure

* Grid flex-row