Feature/new layout