Demo of potential changes to GUI
Started fixing conflicts
Fixing conflicts
Fixing conflicts