Fixed bug with top bar menu