Fixed some menu stuff