Cleanup to sort GUI out and new demo