starting on layout refactor