Firestorm

[REGRESSION] Bottom bar broken after merge