Merged for the end of Sprint 2
 - Alix's Edit Element's Activity's + Adrian/Jamie's element navigation