fixed layout to be called from theme namespace