Preparation for demo, code simplification+GUI changes