Edit content functionality;

Updated Activity-Page-Content structure and made corresponding changes to controllers