fb: small cleanup and fixes in navbar transitions