SONATA-384 - Improve header login/register and basket