Feature/layout logical contents