GUI Rework, basic functions, prep. for machines