Cleaned up code
Update of the GUI table changed