Cleanup and simplification of Makefile
added GUI_draw and GUI_entry to Makefile