Merge of recurring and date tabs and made editing of recurrance a popup