GUI update - still working on bugs