Top bar calculations tweak