some changes to GUI, add database