reorganize settings dialog
update makefile