Added gtk3 fix and makefile cleanup