SOS-1870 Optimize the location of the Edit/Admin Bar