- refactored layout into includes etc.