Moving GUI components to source, also