Added GUI Handler and other things