Added GUI components, not working yet