Minor changes on the GUI module, fixed some imports.