Top navbar optimalization [#8]