Adapt to new reuqest format
Make sure toolbar gets shown in create case