Feature/new simpler layout