Update the layout corresponding to the new TooBar area, fix toolbar location