Fixing the serving of the toolbar