Made some changes to GUI and modified the Makefile.