Fixed Activities showing under Action Plan
Polishing other stuff+Fixing Activity edit page
Still fixing Activity edit view