SOS-2443 Nav-add-controls toggle not working
SOS-2445 Fix Userbar
SOS-2444 Fix Layout for 7.0
SOS-2442 SF