Remove extraneous _layer partial; put partial name determination logic directly in block partial.