feature/ layout refactor