Bottom bar fix.

I forgot about order in css rules...
Top bar calculations tweak
Merge branch 'patch-2' into my-tuning