Change layout to avoid path access issues