Refactor of components parts, with GUI fixes.