Fixed #48 and improves when the menu goes to the smaller version