AdHoc gui implementation for testing purposes; Renamed old components to be removed in the future
Minor rename refactoring