Finish demo app (correctly)