merged the two windows for GUI together