Changed menu method 
changed makefile