GUI Demo and restructuring