Fixed some parts of the menu