fixing bug in model probably
removing repeating code in singelActivityView
moving and removng code in PopUp