Fix bugs with menu