Added GUI code
merge changes