Updates on gui, adding integration into GUI