Code cleanup on the Menu GUI