Code Cleanup
Menu Fix