UPDATE: Split layout in templates