Finish demo app final